From: Kim F. Storm <storm@cua.dk>
Date: Fri, 14 May 2004 20:15:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22481
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=adfd5082385c48d392491255904ef8df359401ec;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 64c9d75b167..ddd7ada7792 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-14  Kim F. Storm  <storm@cua.dk>
+
+	* keyboard.c (in_timer_check): New static var.
+	(timer_check): Use it to guard against reentry.
+
 2004-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* w32fns.c (Fw32_define_rgb_color): Avoid XSET.